Index: test/test_hikidoc.rb
===================================================================
--- test/test_hikidoc.rb	(リビジョン 87)
+++ test/test_hikidoc.rb	(作業コピー)
@@ -311,13 +311,24 @@
   def test_definition_with_link
     assert_convert(%Q|<dl>\n<dt><a href="http://hikiwiki.org/">Hiki</a></dt>\n<dd>Website</dd>\n</dl>\n|,
                    ":[[Hiki|http://hikiwiki.org/]]:Website")
+    assert_convert(%Q|<dl>\n<dt>a</dt>\n<dd><a href="http://hikiwiki.org/">Hiki</a></dd>\n</dl>\n|,
+                   ":a:[[Hiki|http://hikiwiki.org/]]")
   end
 
   def test_definition_with_modifier
     assert_convert(%Q|<dl>\n<dt><strong>foo</strong></dt>\n<dd>bar</dd>\n</dl>\n|,
                    ":'''foo''':bar")
+    assert_convert(%Q|<dl>\n<dt>foo</dt>\n<dd><strong>bar</strong></dd>\n</dl>\n|,
+                   ":foo:'''bar'''")
   end
 
+  def test_definition_with_modifier_link
+    assert_convert(%Q|<dl>\n<dt><strong><a href="http://hikiwiki.org/">Hiki</a></strong></dt>\n<dd>Website</dd>\n</dl>\n|,
+                   ":'''[[Hiki|http://hikiwiki.org/]]''':Website")
+    assert_convert(%Q|<dl>\n<dt>Website</dt>\n<dd><strong><a href="http://hikiwiki.org/">Hiki</a></strong></dd>\n</dl>\n|,
+                   ":Website:'''[[Hiki|http://hikiwiki.org/]]'''")
+  end
+
   def test_table
     assert_convert(%Q|<table border=\"1\">\n<tr><td>a</td><td>b</td></tr>\n</table>\n|,
                    "||a||b")
@@ -367,6 +378,8 @@
   def test_modifier_and_link
     assert_convert("<p><a href=\"http://hikiwiki.org/\"><strong>Hiki</strong></a></p>\n",
                    "[['''Hiki'''|http://hikiwiki.org/]]")
+    assert_convert("<p><strong><a href=\"http://hikiwiki.org/\">Hiki</a></strong></p>\n",
+                   "'''[[Hiki|http://hikiwiki.org/]]'''")
   end
 
   def test_pre_and_plugin
Index: lib/hikidoc.rb
===================================================================
--- lib/hikidoc.rb	(リビジョン 87)
+++ lib/hikidoc.rb	(作業コピー)
@@ -506,7 +506,7 @@
       when chunk = m[1]
         mod, s = split_mod(chunk)
         mid = MODTAG[mod]
-        buf << @output.__send__(mid, compile_modifier(s))
+        buf << @output.__send__(mid, compile_inline(s))
       else
         raise UnexpectedError, "must not happen"
       end